From 351ada30612b45a5836addd54724e9f1982ee128 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Thu, 12 Aug 2010 00:16:07 -0500 Subject: [PATCH] Fix startup hang on GNU/kFreeBSD. --- debian/changelog | 7 ++++++- debian/patches/fix-gnu-kfreebsd-startup.diff | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-gnu-kfreebsd-startup.diff diff --git a/debian/changelog b/debian/changelog index bf46db3e30f..61711388012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,12 @@ emacs23 (23.2+1-3) unstable; urgency=low , and thanks to Stéphane Glondu for the 23.2+1-2.1 NMU. - -- Rob Browning Wed, 11 Aug 2010 22:39:23 -0500 + * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff). + Thanks to antoine beaupre for the report + and Petr Salinger for the patch. + (closes: #559392) + + -- Rob Browning Wed, 11 Aug 2010 23:13:12 -0500 emacs23 (23.2+1-2) unstable; urgency=low diff --git a/debian/patches/fix-gnu-kfreebsd-startup.diff b/debian/patches/fix-gnu-kfreebsd-startup.diff new file mode 100644 index 00000000000..233c190b2f9 --- /dev/null +++ b/debian/patches/fix-gnu-kfreebsd-startup.diff @@ -0,0 +1,20 @@ +* Emacs should no longer hang on startup on Debian GNU/kFreeBSD. + Patch: fix-gnu-kfreebsd-startup.diff + Date: Thu Aug 12 04:21:09 UTC 2010 + Added-by: Rob Browning + Provided-By: Petr Salinger + Bug: 559392 + Status: new + +diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h +index a1e8c02..89563de 100644 +--- a/src/s/gnu-kfreebsd.h ++++ b/src/s/gnu-kfreebsd.h +@@ -7,2 +7,7 @@ + ++#undef INTERRUPT_INPUT ++#define BROKEN_SIGIO ++#define BROKEN_SIGURG ++#define BROKEN_SIGPOLL ++ + #define NO_TERMIO /* use only */ diff --git a/debian/patches/series b/debian/patches/series index 695c4e86b26..e8a55fbcff6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ version-mention-debian.diff look-for-news-to-find-etc.diff fix-flymake-xmlstarlet-invocation.diff add-unix-to-cpp-undefs.diff +fix-gnu-kfreebsd-startup.diff -- 2.30.2